Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

br: Ignore ddl jobs with empty query or blacklist type when exec restore (#33384) #33515

Closed
wants to merge 1 commit into from
Closed

br: Ignore ddl jobs with empty query or blacklist type when exec restore (#33384) #33515

wants to merge 1 commit into from

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 28, 2022 •
edited
Loading

cherry-pick #33384 to release-5.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/33515

After apply modifications, you can push your change to this PR via:

git push [email protected]:ti-srebot/tidb.git pr/33515:release-5.2-11db01105405

What problem does this PR solve?

Issue Number: close #33322

Problem Summary: Sometimes, query of ddl job can be empty, which will cause error when execute incremental restore.

What is changed and how it works?

During backup, when we find ddl job with action types about TiFlash or lock/unlock table, we will set the query empty. So we add an action type blacklist, ddl job with action type in blacklist will be ignored. We also ignore ddl job with empty query in case other unexpected situation.

This means that we will ignore ddl jobs about TiFlash or lock/unlock table and ddl jobs with empty query, so they won't cause error by mistake.

Check List

  • Unit test

Release note

Fix a bug that BR incremental restore return error by mistake caused by ddl job with empty query.

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has not been approved.

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot
Copy link
Member

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Mar 28, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 28, 2022
@ti-srebot ti-srebot mentioned this pull request Mar 28, 2022
Merged
1 task
@ti-srebot ti-srebot added component/br This issue is related to BR of TiDB. type/5.2-cherry-pick labels Mar 28, 2022
@VelocityLight
Copy link

This pull request is closed because it's related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

You can find more details at:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer Awaiting requested review from 3pointer

@joccau joccau Awaiting requested review from joccau

Assignees

@WangLe1321 WangLe1321

Labels
component/br This issue is related to BR of TiDB. do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.2-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-srebot @ti-chi-bot @VelocityLight @WangLe1321